Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 06:45:36 +0000 (23:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 06:45:36 +0000 (23:45 -0700)

Trivial merge